ISC UT beefup

Beef up ISC UTs, to cover all relevant flows.