Refactored to "make test" on containers.