Use short-form for the scaffold render calls and drop the needless test