* Fix for issue #3638 * Update tests for fix for issue #3638 * Fix bug when queryParams and collectionQueryParams are both specified * Update tests * Add certain tests back, address CI failures