Simplify base presenter; Flip confusing conditionals
Fix misnamed method in tests