Update to 2.0

Added more Collision Tests