More tests on VelocityChecker & fixes