Fixed bugs in test and views for store