Update Test.java

Updated and tested all tests to check them after the changes