Add non null search criteria & unit tests