Begin to fix tests