Fix presenter aliases and tests