- beautification of QueryDemoTest