Updated JUnit style to 4+ with @Before