Tests for search. Only missing sorting, and date picker, which we are waiting on for later.
Merge remote-tracking branch 'origin/master' into HEAD
no idea where these changes went
Merge commit 'd1fe5fdbc9c0802ee8fe8a207a076dcab413f103'
merge