Changed user storage structure, added more to test suite.