combined diff between master and paramdisplay, test still commented out