fix unit-tests for scaffolding