fixed collision detection and implemented test reqs