tidy up requires and add a query test