Merge "New test in FrameworkTest for the VelocityTracker class"