Adding test coverage support