Fixed bugs in testing framework.  Made it slightly more Object Oriented.