finished container api ; refactored tests to test with containers