Start fixing some of the test I broke with my iCASA fix

Signed-off-by: Clement Escoffier <clement.escoffier@gmail.com>