Improve StrategyClasses

Added some strategy options and test classes.