Added code coverage filter
Some refactoring