Added more tests for the Presenter and fixed some bugs.