Improved unit tests with 4 character collision tests. Fixed some collisions.