Possible fix for collisions at test start (possibly with remove)