Improved some methods using the VerifyAll method.