Created the seatch and moved some tests