Add search using cursors to test. Tidy test output.