Improve test portability