Fixes and SpaceContainer's missing tests.