Added new modules to handle coverage and tests