Starting to fix tests