Expect find call to improve spec stability
Change key value format