Fix tests and coverage (needed to add Test at end of test files).