Fixing formatting of status output
Getting tests to pass
More refactoring of container instantiation