Test update to explicitly cover problematic scenario. Reviewed-by: chegar
Reviewed-by: chegar, michaelm