Added collision tests
Added tests to sprite.pointCollides method
merges