Add full mutation coverage

Some other basic refactorings
Adjust metric scores