- Upgraded to using more JUnit 4.x style with @Test annotations