Updated test file, added query