Merge methods one() and all() to query()
Update test