Code coverage tests, and bug fixes.