Working on flexstore (tests)
updated