[BUGFIX] Fix scaffolded tests