Use query method naming, introduce a couple of constants.

Also fetched the latest tests which had a different file name and
expected a different implementation file name.