minor test fixes
Merge branch 'barnacle'
Merge branch 'master' into replication