Restore changes from 0332501 (fix class loader test failure)
Add missing YAML file for test