Removed set_verbs from scaffolding; updated tests