fixed some more test issues - one unknown issue remaining and two knows issues where the model and view need to be extended with a dispose method