Remove sample test
Split tests into separate files. Add test to check for correct strategy choice
Contain autoloading in distinct class. Remove redundant includes.
Minor comment tweals