Roxy2

Fixes formatting for JUnit tests.