sys-test fixes