cleanup work on the rbm unit test