Modified the tests to a single container