BRMS testsuite updates