adjust store related entities, add store related test cases.