Bug fix velocity criteria and test it