Stabilise CRUD tests

ofc I can - done ;)