modified tests to have JUnit style