Content search fixes

Fixed setup and large number of content-search tests.
Setup is done by rest-api now.