Attemped to fix tests