Commit JUnit tests for Universe
Clean up syntax (checkstyle)