Fix tests for new scaffold