Cleaned up test coverage