Fixing broken test
More test fixes