Clean up tests, and get cca to 95.45% covered.