Update all calls to makeContainer
Clean up and get tests passing in phantom