Fix tests for scaffolding