Implementing more search tests

Also clean up some HTML to remove a superfluous <div>.

Done in pair-programming with Niklas and Amir.

Change-Id: I3e515ab5d4724a5b6f6faa3ac8c7eb1880eeb979