test fixes for v68-beta-4