Minor improvements and more tests for symbol querying