Adjust strategy tests to work with latest strategy restructure.
Merge branch 'strategy-up'
Adjust strategy test to use scaled clock