Added support to test coverage