Feature/mockstore