Committing new tests from Q2 search and changes made in the existing files.