Fix Scaffolding.  Finish Unit Testing