add more integration tests for parent/child mapping
update MR tests