Enhanced tests to check we are correctly passing query parameters