Renamed db.criteria to db.query
Updated the test
Updated the makefile