different approach to dataset page loading
more test timing fixes