Scaffolding update
Test cases for #712