Tidy up of DBAccessor and DBAccessorTest