Much better test coverage