Changing the structure of the SIMPLESEARCH endpoint. Fixed some tests.