fixed velocity loading, added test cases