Add helper methods to get store def and fix existing test