1) Adding query package for query generator
2) Adding new test programs