Better JUnit tests

For whatever that does for us.