Added collision tests + logic fixes
Added Logic tests + logic fixes
Fixed drawing