test fixes - work in progress