Mutation test refactoring

Mutation test refactoring (reducing code duplication, class structure reorganizing)