Pr/374

Okay, I think this makes all the test that were failing pass.  I'm running all the tests now to make sure I didn't break anything else.