0.9: Clean-up of unit tests.