Fix the CRUD tests

All the unit tests pass again \o/