- Reenabled some unit-tests
- Updated resources to Dev
- Fix unit tests for ModelClassFactory