Cleaned up test directory
Improved multiple no-query output.