remote test fixes