Fixed some presenter issues and added working tests