Renamed VerifyNone to NoVerify, edited some tests