Refactored Tests.java to join other tests
fixed merge