Update to fix tests that were broken