Remove obsolete method
Add tests for all query methods