test fixes
Merge pull request #974 from john-hill/build-fix

test fixes