test stage fixes