amending some tests for junit