minor test fixes
Merge branch 'barnacle'