Unfudged tests now passing thanks to Mouq++'s work