killed off the useless tests
simplified the class loading