More unit tests to bring it in line with Search