storage of data is more sane and tests now pass