Moved tests to core for search model