Updated to new JUnit test style