Fixed collision detection

Added a test loader so we can debug more constrained scenarios