Removed some console.logs.
Fixed a bug in _query() + tests cleanup.
Cleanup.