fixed collisions and added unit tests