Finish container and tests for it