Unfudge 2 now passing tests: Mouq++