Content storage class refactor, added tests