improvements to test to help osx