Adding more PreValidate tests and removing redundant code