Update test to JUnit 4, Square code style.
Merge pull request #883 from square/jw/code-style

Update test to JUnit 4, Square code style.