Simplify create_classes
A bit more cleanup
Restructure tests