Tried to fix tests