More robust tests added to test class.