tests pass on linux again now.  Now need to test on windows again