Split classes to separate files
Complete model test
Remove debug output