Making the Tests look more like regular functions
Making changes to UnitTest to allow them to be grouped together more easily