Expanding unit test coverage a lot