US4 tests
fixed merge conflict