Restucture with QueryParser and Test #40