Added code coverage
Resolved issues with extending modules