Fix tests to conform to scaffolding