Fixed CollisionTest weirdness.
Merge branch 'inherit' into test