Fixes failing ContainerTest