Fixing tests that were failing