Fixed bugs

* Fixed errors in collision detection
* Fixed periodic "couldn't load dependency" error in unit tests