Checking collections on update, adding test

Resolves the BoT