Minor cleanup and fix test that was dependent on
non-embedded db.