implement CAT-1064 - When collision between
add test and change testsuite for collision tests
solve conflicts of rebaseing