ISPN-2353 Added test, not replicated yet...