Full test coverage and passing