Adds additional queries to query_tests. Corrects basepoints test for input condition.