Started rewrite of trading logic in test class. Hopefully to increase gains.