WINDUP-269: Some tests run too many rulleproviders + small test refactoring
Merge branch 'WINDUP-269' of https://github.com/mbriskar/windup into mbriskar-WINDUP-269
Merge branch 'mbriskar-WINDUP-269'