Tests are passing except merged mappings