Make DB field private.  Other minor test fixes