Add FsQuery tests