Complete output mutator changes. Fixed tests