modified strategies and added some test data
merged
fixed momentum a bit