WINDUP-269: Some tests run too many rulleproviders + small test refactor...

...ing