Added presenter test, refactored classes.