WINDUP-269: Some tests run too many rulleproviders + small test refactoring
WINDUP-226: Classification adds multiple fileModels even though they are the same