added functionality to all integration tests, and system test 1 layout