Little changes and JUnit tests.