Added tests for scaffolding