Test container wrapping fix