system test fixes