Updating to save changes.  Most changes occur on tester class, several things have been added