Two more tests converted to JUnit...