Fix all teh test coverage!