Updating tests files and fixtures