revert previous commit, flag collision tests