Improve tests for coincidence_queries

Add tets for new methods
Fix broken tests because of existing methods, using new methods, etc..