Updated error with tests.  Fixed up initial pending tests for Scaffold