Fixing .query and adding more tests
Activate lint in test scripts to Travis