tweaks to support both postbooks and masterref in tests