Collider Testing Complete

-Jsonify's complete and passing
-Beginning entity testing and jsonify