Bring unit test coverage back to 100%