Coverage, expanded and fixed unit tests.