updated webguy
testloader extracted to class
TestLoader moved to its own class