Fix Tests

Fix all tests to run with prior upgrades