WINDUP-377: Parameterized Rules - Bugfixes and workaround to fix unit tests