Initial complete implementation of test-in-velocity