Adjusting jUnit tests to PASS for now