Merge "Move the test_utils module to scenario test dir"