added more collision resolution and a better test