Updating Master

Updated test to remove the classes and just call from methods. Using a class proved to be difficult for me.