Add test and developing query module.