[WIP] more component test fixes