Improved store returns and ignored some tests