fix tests after removal of Container