Repaired failing tests for scaffolding