Fix failing tests due to changing store from yes/no to bool