Increase the test portability