unfudge now passing tests