extend datastore performance tests to cover scenario described in #3903 -- but no...