Adding testing for pa+storage