More refactoring of tests, more coverage.