* Add comments to kill lint errors
* Rename querymods qs package to qm * Refactor comparing values in template tests to remove redundancy