Fix data request test feature to match recent changes