Refactoring in the RBT tests