Refactors presenter and tests.