update fixtures and tests for merge