Merge "Update tests to support floating search." into tm-qpr-dev