update to make test suite portable