Completed fixing tests and restoring 100% coverage.