Continued code coverage
Moved ClassLoader to Util
Adds more code coverage