Checking collections on update, adding test

Resolves the BoT http://code.google.com/p/otwarchive/issues/detail?id=3083