Added dom and domenv to overlaying plan
Modified integration tests
Modified unit tests
Modified test data
Modified test data