Moved methods to Strategy baseclass
Added options for strategies
Added tests for strategies