Attemptying to fix tests