Fix #9 query inclusion, and added tests