BRMS: Better cleanup after tests