Switched to JUnit 4.11
Moved tests to the test scope