Cleaned up Search-test