Fixed a couple of tests that no longer worked.