Also convert those checks to use abcs instead of dict and list. Make a sentinel class for strategies to report when they've reache the end
* Relocate module unit tests. * Fix classification of unit test changes.