Add more collision unit test.
Merge branch 'origin/refactoring'