Fixes failing tests with set, insert and delete