Merge "Add mapping rules integration tests"