Fixes for some of the failing JUnit tests.
6 files changed