Some fixed tests, removed some redundant code, updated ITQuery

Signed-off-by: Wim Tibackx <wim.tibackx@student.kdg.be>