System test fixes