few modifications and correction to the model tester class