fix fixtures and tests