Add slightly easier to read test data injector; add search test using it