Add mutation covering specs

* Do some metric/mutation guided refactorings