Everything is now in a state where tests pads.  Ugly, but passing tests.