updated some tests and reorganized gazetteer query package structure
updated more tests