more manual test fixes