Add tests for direct holder containers