Added user scaffolding for tests