More general test coverage