[Bug] Fix Tests

Fixes for the tests which were failing.  Two of them could have gone either way, so I left comments!