add storage class and tests