[ClassCollectionLoader] make faster (traits don't support if)
[ClassMapGenerator] Improves the tests
euh....