CR feedback, merge some of the testutils methods down, rename the classloader
Fix tests for new class name