Stabilise CRUD tests

Yeap, it is.