Added checks for TPI + Verlet scheme

Change-Id: I040f4cc9dbb8ff25ed97d18cca0b4a2c1e7014b0