added remaining collision tests