store cleaned, tests added