Making progress on collision tests