Trying to fix tests now