Fixed all scaffolding tests