Summary: Rewrote test in Java; updated the test condition to reflect latest changes in the source
Reviewed-by: dholmes, ctornqvi