updates for tests to work on osx, too.