Fixing tests (broken by automated code refactoring)