Simplify store.has implementation, and add additional test case