modify unit test and aai query