Made the test coverage more fair