Never mind. Tests are fixed. Also re-added some conditionals to the query method module.