Clean up searching, add remaining obvious tests