Fixing tests?