All code now hopefully up to date with storing slots in their own collection.
All tests are now passed again.