More test fixes for dock