Mihir | Adding tests and making models jsonify