Class loader test and loader tweaks