Refactoring in testbopmodel in demo1b