Added error handling and fixed test in Search Simple terms