Trying fix tests