0.9: Enhance unit testing.