Fix point queries. Expand tests. Use tokens