Fixing tests due to recent changes