diff --git a/app/__init__.py b/app/__init__.py
index 3c581ceeb..03f74c41d 100644
--- a/app/__init__.py
+++ b/app/__init__.py
@@ -1,7 +1,10 @@
+import os
 from flask import Flask
-from .db import db, migrate
 from .models import task, goal
-import os
+from .db import db, migrate
+from app.routes.task_routes import bp as tasks_bp
+from app.routes.goal_routes import bp as goals_bp
+from app.routes.home_routes import bp as home_bp
 
 def create_app(config=None):
     app = Flask(__name__)
@@ -18,5 +21,8 @@ def create_app(config=None):
     migrate.init_app(app, db)
 
     # Register Blueprints here
+    app.register_blueprint(tasks_bp)
+    app.register_blueprint(goals_bp)
+    app.register_blueprint(home_bp)
 
     return app
diff --git a/app/models/goal.py b/app/models/goal.py
index 44282656b..d04c5d787 100644
--- a/app/models/goal.py
+++ b/app/models/goal.py
@@ -1,5 +1,34 @@
-from sqlalchemy.orm import Mapped, mapped_column
+from sqlalchemy.orm import Mapped, mapped_column, relationship
+from sqlalchemy import String
+from typing import TYPE_CHECKING
 from ..db import db
 
+if TYPE_CHECKING:
+    from .task import Task
+
 class Goal(db.Model):
     id: Mapped[int] = mapped_column(primary_key=True, autoincrement=True)
+    title: Mapped[str] = mapped_column(String(255))
+    tasks: Mapped[list["Task"]] = relationship(back_populates="goal")
+
+    def to_dict(self, include_tasks=False, ids_only=False):
+        if ids_only:
+            return {
+                    "id": self.id,
+                    "task_ids": [task.id for task in self.tasks]
+            }
+        
+        goal_as_dict = {
+            "id": self.id,
+            "title": self.title,
+        }
+
+        if include_tasks:
+            goal_as_dict["tasks"] = [task.to_dict() for task in self.tasks]
+
+        return goal_as_dict
+
+    @classmethod
+    def from_dict(cls, goal_dict):
+        new_goal = cls(title=goal_dict["title"])
+        return new_goal
diff --git a/app/models/task.py b/app/models/task.py
index 5d99666a4..d49713d56 100644
--- a/app/models/task.py
+++ b/app/models/task.py
@@ -1,5 +1,35 @@
-from sqlalchemy.orm import Mapped, mapped_column
+from sqlalchemy.orm import Mapped, mapped_column, relationship
+from sqlalchemy import String, ForeignKey
+from datetime import datetime
+from typing import Optional, TYPE_CHECKING
 from ..db import db
 
+if TYPE_CHECKING:
+    from .goal import Goal
 class Task(db.Model):
     id: Mapped[int] = mapped_column(primary_key=True, autoincrement=True)
+    title: Mapped[str]= mapped_column(String(255))
+    description: Mapped[str] 
+    completed_at: Mapped[Optional[datetime]] 
+    goal_id: Mapped[Optional[int]] = mapped_column(ForeignKey("goal.id"))
+    goal: Mapped[Optional["Goal"]] = relationship(back_populates="tasks")
+
+    def to_dict(self):
+        task_as_dict = {
+            "id": self.id,
+            "title": self.title,
+            "description": self.description,
+            "is_complete": True if self.completed_at else False,
+        }
+
+        if self.goal_id is not None:
+            task_as_dict["goal_id"] = self.goal_id
+        
+        return task_as_dict
+    
+    @classmethod
+    def from_dict(cls,task_dict):
+        return cls(   
+            title=task_dict["title"],
+            description=task_dict["description"],
+            )
diff --git a/app/routes/goal_routes.py b/app/routes/goal_routes.py
index 3aae38d49..b60ab25ec 100644
--- a/app/routes/goal_routes.py
+++ b/app/routes/goal_routes.py
@@ -1 +1,60 @@
-from flask import Blueprint
\ No newline at end of file
+from flask import Blueprint, request, abort, make_response, Response
+from .route_utilities import validate_model, create_model, update_model, get_models_with_filters
+from ..models.goal import Goal
+from ..models.task import Task
+from app.db import db
+
+bp = Blueprint("goals_bp", __name__, url_prefix="/goals")
+
+@bp.post("")
+def create_goal():
+    request_body = request.get_json()
+    return create_model(Goal, request_body)
+
+@bp.post("/<goal_id>/tasks")
+def create_task_with_goal(goal_id):
+    goal = validate_model(Goal, goal_id)
+    request_body = request.get_json()
+    
+    try:
+        task_ids = request_body["task_ids"]
+    except KeyError:
+        invalid_msg = {"details": "Invalid data"}
+        abort(make_response(invalid_msg, 400))
+
+    tasks = [validate_model(Task, task_id) for task_id in task_ids]
+    
+    goal.tasks = tasks
+    db.session.commit()
+
+    return goal.to_dict(ids_only=True)
+
+@bp.get("")
+def get_all_goals():
+    return get_models_with_filters(Goal, filters=request.args)
+
+@bp.get("/<goal_id>")
+def get_one_goal(goal_id):
+    goal = validate_model(Goal, goal_id)
+
+    return goal.to_dict()
+
+@bp.get("/<goal_id>/tasks")
+def get_tasks_by_goal(goal_id):
+    goal = validate_model(Goal, goal_id)
+
+    return goal.to_dict(include_tasks=True)
+
+@bp.put("/<goal_id>")
+def update_goal(goal_id):
+    required_keys = ["title"]
+    return update_model(Goal, goal_id, required_keys)
+
+@bp.delete("/<goal_id>")
+def delete_goal(goal_id):
+    goal = validate_model(Goal, goal_id)
+
+    db.session.delete(goal)
+    db.session.commit()
+
+    return Response(status=204, mimetype="application/json")
\ No newline at end of file
diff --git a/app/routes/home_routes.py b/app/routes/home_routes.py
new file mode 100644
index 000000000..87cdef8c5
--- /dev/null
+++ b/app/routes/home_routes.py
@@ -0,0 +1,8 @@
+from flask import Blueprint
+
+bp = Blueprint("home_bp", __name__)
+
+
+@bp.get("/")
+def home_page():
+    return "<h1>✨Welcome to Makiko’s Task List API✨</h1>"
\ No newline at end of file
diff --git a/app/routes/route_utilities.py b/app/routes/route_utilities.py
new file mode 100644
index 000000000..d9bdc2c94
--- /dev/null
+++ b/app/routes/route_utilities.py
@@ -0,0 +1,74 @@
+from flask import abort, make_response, Response, request
+from ..db import db
+
+def validate_model(cls,model_id):
+    try:
+        model_id = int(model_id)
+    except ValueError:
+        invalid = {"message": f"{cls.__name__} ({model_id}) is invalid."}
+        abort(make_response(invalid, 400))
+    
+    query = db.select(cls).where(cls.id == model_id)
+    model = db.session.scalar(query)
+
+    if not model:
+        not_found = {"message" : f"{cls.__name__} ({model_id}) is not found."}  
+        abort(make_response(not_found, 404))
+
+    return model
+
+def create_model(cls, model_data):
+    try:
+        new_model =cls.from_dict(model_data)
+    except KeyError as error:
+        invalid_msg = {"details": "Invalid data"}
+        abort(make_response(invalid_msg, 400))
+    
+    db.session.add(new_model)
+    db.session.commit()
+
+    return new_model.to_dict(), 201
+
+def update_model(cls, model_id, required_keys): 
+    model = validate_model(cls, model_id)
+    request_body = request.get_json()
+
+    for key in required_keys:
+        if key not in request_body:
+            invalid_msg = {"details": "Invalid data"}
+            abort(make_response(invalid_msg, 400))
+
+    for key in required_keys:
+        setattr(model,key,request_body[key])
+
+    db.session.commit()
+
+    return Response(status=204, mimetype="application/json")
+
+def get_models_with_filters(cls, filters=None):
+    query = db.select(cls)
+
+    if filters:
+        for attribute, value in filters.items():
+            if attribute == "sort":
+                query = apply_sort_to_query(cls, query, value)
+            elif hasattr(cls, attribute):
+                query = query.where(getattr(cls, attribute).ilike(f"%{value}%"))
+
+    models = db.session.scalars(query.order_by(cls.id))
+    models_response = [model.to_dict() for model in models]
+    return models_response
+
+def apply_sort_to_query(cls, query, sort_type):
+    valid_sort = {
+        "asc": cls.title,
+        "desc": cls.title.desc()
+    }
+    sort_type = sort_type.casefold().strip()
+
+    if sort_type not in valid_sort:
+        invalid_msg = {"message": "Invalid sort value. Valid options: asc, desc."}
+        abort(make_response(invalid_msg, 400))
+
+    return query.order_by(valid_sort[sort_type])
+
diff --git a/app/routes/task_routes.py b/app/routes/task_routes.py
index 3aae38d49..8245cb05f 100644
--- a/app/routes/task_routes.py
+++ b/app/routes/task_routes.py
@@ -1 +1,57 @@
-from flask import Blueprint
\ No newline at end of file
+from flask import Blueprint, request, Response
+from .route_utilities import validate_model, create_model, get_models_with_filters, update_model
+from datetime import datetime
+from app.models.task import Task
+from app.services.slack_service import send_msg_slack
+from app.db import db
+
+bp = Blueprint("tasks_bp", __name__, url_prefix="/tasks")
+
+@bp.post("")
+def create_task():
+    request_body = request.get_json()
+    return create_model(Task, request_body)
+
+@bp.get("")
+def get_all_tasks():
+    return get_models_with_filters(Task, filters=request.args)
+
+@bp.get("/<task_id>")
+def get_one_task(task_id):
+    task = validate_model(Task,task_id)
+    
+    return task.to_dict()
+
+@bp.put("/<task_id>")
+def update_task(task_id):
+    required_keys = ["title", "description"]
+    return update_model(Task, task_id, required_keys)
+
+@bp.patch("/<task_id>/mark_complete")
+def mark_complete_task(task_id):
+    task = validate_model(Task, task_id)
+    task.completed_at = datetime.now()
+
+    db.session.commit()
+
+    send_msg_slack(task)
+
+    return Response(status=204, mimetype="application/json")
+
+@bp.patch("/<task_id>/mark_incomplete")
+def mark_incomplete_task(task_id):
+    task = validate_model(Task, task_id)
+    task.completed_at = None
+
+    db.session.commit()
+
+    return Response(status=204, mimetype="application/json")
+
+@bp.delete("/<task_id>")
+def delete_task(task_id):
+    task = validate_model(Task,task_id)
+    
+    db.session.delete(task)
+    db.session.commit()
+
+    return Response(status=204, mimetype="application/json")
diff --git a/app/services/slack_service.py b/app/services/slack_service.py
new file mode 100644
index 000000000..45f03002c
--- /dev/null
+++ b/app/services/slack_service.py
@@ -0,0 +1,19 @@
+import os
+import requests
+
+
+SLACK_URL = "https://slack.com/api/chat.postMessage"
+SLACK_API_KEY = os.environ.get('SLACK_API_KEY')
+
+def send_msg_slack(task):
+    json_body = {
+        "channel": "C09N95RPR34",
+        "text": f"Someone just completed the task {task.title}"
+    }
+
+    headers = {
+        "Authorization": f"Bearer {SLACK_API_KEY}",
+        "Content-Type": "application/json"
+    }
+    
+    requests.post(SLACK_URL, json=json_body, headers=headers)
\ No newline at end of file
diff --git a/migrations/README b/migrations/README
new file mode 100644
index 000000000..0e0484415
--- /dev/null
+++ b/migrations/README
@@ -0,0 +1 @@
+Single-database configuration for Flask.
diff --git a/migrations/alembic.ini b/migrations/alembic.ini
new file mode 100644
index 000000000..ec9d45c26
--- /dev/null
+++ b/migrations/alembic.ini
@@ -0,0 +1,50 @@
+# A generic, single database configuration.
+
+[alembic]
+# template used to generate migration files
+# file_template = %%(rev)s_%%(slug)s
+
+# set to 'true' to run the environment during
+# the 'revision' command, regardless of autogenerate
+# revision_environment = false
+
+
+# Logging configuration
+[loggers]
+keys = root,sqlalchemy,alembic,flask_migrate
+
+[handlers]
+keys = console
+
+[formatters]
+keys = generic
+
+[logger_root]
+level = WARN
+handlers = console
+qualname =
+
+[logger_sqlalchemy]
+level = WARN
+handlers =
+qualname = sqlalchemy.engine
+
+[logger_alembic]
+level = INFO
+handlers =
+qualname = alembic
+
+[logger_flask_migrate]
+level = INFO
+handlers =
+qualname = flask_migrate
+
+[handler_console]
+class = StreamHandler
+args = (sys.stderr,)
+level = NOTSET
+formatter = generic
+
+[formatter_generic]
+format = %(levelname)-5.5s [%(name)s] %(message)s
+datefmt = %H:%M:%S
diff --git a/migrations/env.py b/migrations/env.py
new file mode 100644
index 000000000..4c9709271
--- /dev/null
+++ b/migrations/env.py
@@ -0,0 +1,113 @@
+import logging
+from logging.config import fileConfig
+
+from flask import current_app
+
+from alembic import context
+
+# this is the Alembic Config object, which provides
+# access to the values within the .ini file in use.
+config = context.config
+
+# Interpret the config file for Python logging.
+# This line sets up loggers basically.
+fileConfig(config.config_file_name)
+logger = logging.getLogger('alembic.env')
+
+
+def get_engine():
+    try:
+        # this works with Flask-SQLAlchemy<3 and Alchemical
+        return current_app.extensions['migrate'].db.get_engine()
+    except (TypeError, AttributeError):
+        # this works with Flask-SQLAlchemy>=3
+        return current_app.extensions['migrate'].db.engine
+
+
+def get_engine_url():
+    try:
+        return get_engine().url.render_as_string(hide_password=False).replace(
+            '%', '%%')
+    except AttributeError:
+        return str(get_engine().url).replace('%', '%%')
+
+
+# add your model's MetaData object here
+# for 'autogenerate' support
+# from myapp import mymodel
+# target_metadata = mymodel.Base.metadata
+config.set_main_option('sqlalchemy.url', get_engine_url())
+target_db = current_app.extensions['migrate'].db
+
+# other values from the config, defined by the needs of env.py,
+# can be acquired:
+# my_important_option = config.get_main_option("my_important_option")
+# ... etc.
+
+
+def get_metadata():
+    if hasattr(target_db, 'metadatas'):
+        return target_db.metadatas[None]
+    return target_db.metadata
+
+
+def run_migrations_offline():
+    """Run migrations in 'offline' mode.
+
+    This configures the context with just a URL
+    and not an Engine, though an Engine is acceptable
+    here as well.  By skipping the Engine creation
+    we don't even need a DBAPI to be available.
+
+    Calls to context.execute() here emit the given string to the
+    script output.
+
+    """
+    url = config.get_main_option("sqlalchemy.url")
+    context.configure(
+        url=url, target_metadata=get_metadata(), literal_binds=True
+    )
+
+    with context.begin_transaction():
+        context.run_migrations()
+
+
+def run_migrations_online():
+    """Run migrations in 'online' mode.
+
+    In this scenario we need to create an Engine
+    and associate a connection with the context.
+
+    """
+
+    # this callback is used to prevent an auto-migration from being generated
+    # when there are no changes to the schema
+    # reference: http://alembic.zzzcomputing.com/en/latest/cookbook.html
+    def process_revision_directives(context, revision, directives):
+        if getattr(config.cmd_opts, 'autogenerate', False):
+            script = directives[0]
+            if script.upgrade_ops.is_empty():
+                directives[:] = []
+                logger.info('No changes in schema detected.')
+
+    conf_args = current_app.extensions['migrate'].configure_args
+    if conf_args.get("process_revision_directives") is None:
+        conf_args["process_revision_directives"] = process_revision_directives
+
+    connectable = get_engine()
+
+    with connectable.connect() as connection:
+        context.configure(
+            connection=connection,
+            target_metadata=get_metadata(),
+            **conf_args
+        )
+
+        with context.begin_transaction():
+            context.run_migrations()
+
+
+if context.is_offline_mode():
+    run_migrations_offline()
+else:
+    run_migrations_online()
diff --git a/migrations/script.py.mako b/migrations/script.py.mako
new file mode 100644
index 000000000..2c0156303
--- /dev/null
+++ b/migrations/script.py.mako
@@ -0,0 +1,24 @@
+"""${message}
+
+Revision ID: ${up_revision}
+Revises: ${down_revision | comma,n}
+Create Date: ${create_date}
+
+"""
+from alembic import op
+import sqlalchemy as sa
+${imports if imports else ""}
+
+# revision identifiers, used by Alembic.
+revision = ${repr(up_revision)}
+down_revision = ${repr(down_revision)}
+branch_labels = ${repr(branch_labels)}
+depends_on = ${repr(depends_on)}
+
+
+def upgrade():
+    ${upgrades if upgrades else "pass"}
+
+
+def downgrade():
+    ${downgrades if downgrades else "pass"}
diff --git a/migrations/versions/0c01801b304d_.py b/migrations/versions/0c01801b304d_.py
new file mode 100644
index 000000000..1274322cb
--- /dev/null
+++ b/migrations/versions/0c01801b304d_.py
@@ -0,0 +1,39 @@
+"""empty message
+
+Revision ID: 0c01801b304d
+Revises: 
+Create Date: 2025-10-30 14:44:35.800016
+
+"""
+from alembic import op
+import sqlalchemy as sa
+
+
+# revision identifiers, used by Alembic.
+revision = '0c01801b304d'
+down_revision = None
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.create_table('goal',
+    sa.Column('id', sa.Integer(), autoincrement=True, nullable=False),
+    sa.PrimaryKeyConstraint('id')
+    )
+    op.create_table('task',
+    sa.Column('id', sa.Integer(), autoincrement=True, nullable=False),
+    sa.Column('title', sa.String(length=255), nullable=False),
+    sa.Column('description', sa.Text(), nullable=False),
+    sa.Column('completed_at', sa.DateTime(), nullable=True),
+    sa.PrimaryKeyConstraint('id')
+    )
+    # ### end Alembic commands ###
+
+
+def downgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.drop_table('task')
+    op.drop_table('goal')
+    # ### end Alembic commands ###
diff --git a/migrations/versions/7e6d5449706f_create_a_one_goal_to_many_relationship_.py b/migrations/versions/7e6d5449706f_create_a_one_goal_to_many_relationship_.py
new file mode 100644
index 000000000..d65f67d67
--- /dev/null
+++ b/migrations/versions/7e6d5449706f_create_a_one_goal_to_many_relationship_.py
@@ -0,0 +1,34 @@
+"""Create a one (Goal) to many relationship (Task) 
+
+Revision ID: 7e6d5449706f
+Revises: ce3af07cc939
+Create Date: 2025-11-03 20:43:34.616770
+
+"""
+from alembic import op
+import sqlalchemy as sa
+
+
+# revision identifiers, used by Alembic.
+revision = '7e6d5449706f'
+down_revision = 'ce3af07cc939'
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    with op.batch_alter_table('task', schema=None) as batch_op:
+        batch_op.add_column(sa.Column('goal_id', sa.Integer(), nullable=True))
+        batch_op.create_foreign_key(None, 'goal', ['goal_id'], ['id'])
+
+    # ### end Alembic commands ###
+
+
+def downgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    with op.batch_alter_table('task', schema=None) as batch_op:
+        batch_op.drop_constraint(None, type_='foreignkey')
+        batch_op.drop_column('goal_id')
+
+    # ### end Alembic commands ###
diff --git a/migrations/versions/ce3af07cc939_.py b/migrations/versions/ce3af07cc939_.py
new file mode 100644
index 000000000..80826ea8b
--- /dev/null
+++ b/migrations/versions/ce3af07cc939_.py
@@ -0,0 +1,44 @@
+"""empty message
+
+Revision ID: ce3af07cc939
+Revises: 0c01801b304d
+Create Date: 2025-11-02 13:04:44.143880
+
+"""
+from alembic import op
+import sqlalchemy as sa
+
+
+# revision identifiers, used by Alembic.
+revision = 'ce3af07cc939'
+down_revision = '0c01801b304d'
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    with op.batch_alter_table('goal', schema=None) as batch_op:
+        batch_op.add_column(sa.Column('title', sa.String(length=255), nullable=False))
+
+    with op.batch_alter_table('task', schema=None) as batch_op:
+        batch_op.alter_column('description',
+               existing_type=sa.TEXT(),
+               type_=sa.String(),
+               existing_nullable=False)
+
+    # ### end Alembic commands ###
+
+
+def downgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    with op.batch_alter_table('task', schema=None) as batch_op:
+        batch_op.alter_column('description',
+               existing_type=sa.String(),
+               type_=sa.TEXT(),
+               existing_nullable=False)
+
+    with op.batch_alter_table('goal', schema=None) as batch_op:
+        batch_op.drop_column('title')
+
+    # ### end Alembic commands ###
diff --git a/tests/test_wave_01.py b/tests/test_wave_01.py
index fac95a0a3..aebb84e7e 100644
--- a/tests/test_wave_01.py
+++ b/tests/test_wave_01.py
@@ -1,59 +1,61 @@
+from werkzeug.exceptions import HTTPException
 from app.models.task import Task
+from app.routes.route_utilities import validate_model
 from app.db import db
 import pytest
 
-@pytest.mark.skip(reason="No way to test this feature yet")
+# @pytest.mark.skip(reason="No way to test this feature yet")
 def test_task_to_dict():
-    #Arrange
+    # Arrange
     new_task = Task(id = 1, title="Make My Bed", 
                     description="Start the day off right!", 
                     completed_at=None)
     
-    #Act
+    # Act
     task_dict = new_task.to_dict()
 
-    #Assert
+    # Assert
     assert len(task_dict) == 4
     assert task_dict["id"] == 1
     assert task_dict["title"] == "Make My Bed"
     assert task_dict["description"] == "Start the day off right!"
     assert task_dict["is_complete"] == False
 
-@pytest.mark.skip(reason="No way to test this feature yet")
+# @pytest.mark.skip(reason="No way to test this feature yet")
 def test_task_to_dict_missing_id():
-    #Arrange
+    # Arrange
     new_task = Task(title="Make My Bed", 
                     description="Start the day off right!", 
                     completed_at=None)
     
-    #Act
+    # Act
     task_dict = new_task.to_dict()
 
-    #Assert
+    # Assert
     assert len(task_dict) == 4
     assert task_dict["id"] is None
     assert task_dict["title"] == "Make My Bed"
     assert task_dict["description"] == "Start the day off right!"
     assert task_dict["is_complete"] == False
 
-@pytest.mark.skip(reason="No way to test this feature yet")
+# @pytest.mark.skip(reason="No way to test this feature yet")
 def test_task_to_dict_missing_title():
-    #Arrange
+    # Arrange
     new_task = Task(id = 1,
                     description="Start the day off right!", 
                     completed_at=None)
     
-    #Act
+    # Act
     task_dict = new_task.to_dict()
 
-    #Assert
+    # Assert
     assert len(task_dict) == 4
     assert task_dict["id"] == 1
     assert task_dict["title"] is None
     assert task_dict["description"] == "Start the day off right!"
     assert task_dict["is_complete"] == False
 
-@pytest.mark.skip(reason="No way to test this feature yet")
+# @pytest.mark.skip(reason="No way to test this feature yet")
 def test_task_from_dict():
     #Arrange
     task_dict =  {
@@ -62,39 +64,58 @@ def test_task_from_dict():
         "is_complete": False
     }
 
-    #Act
+    # Act
     task_obj =  Task.from_dict(task_dict)
 
-    #Assert
+    # Assert
     assert task_obj.title == "Make My Bed"
     assert task_obj.description == "Start the day off right!"
     assert task_obj.completed_at is None
 
-@pytest.mark.skip(reason="No way to test this feature yet")
+# Add extra test for from_dict
+def test_task_from_dict_extra_keys():
+    # Arrange
+    task_dict =  {
+        "title": "Make My Bed",
+        "description": "Start the day off right!",
+        "is_complete": False,
+        "extra" : "some value"
+    }
+
+    # Act
+    task_obj = Task.from_dict(task_dict)
+
+    # Assert 
+    assert task_obj.title == "Make My Bed"
+    assert task_obj.description == "Start the day off right!"
+    assert task_obj.completed_at is None
+    assert not hasattr(task_obj, "extra")
+
+# @pytest.mark.skip(reason="No way to test this feature yet")
 def test_task_from_dict_no_title():
-    #Arrange
+    # Arrange
     task_dict =  {
         "description": "Start the day off right!",
         "is_complete": False
     }
 
-    #Act & Assert
+    # Act & Assert
     with pytest.raises(KeyError, match = 'title'):
         Task.from_dict(task_dict)
 
-@pytest.mark.skip(reason="No way to test this feature yet")
+# @pytest.mark.skip(reason="No way to test this feature yet")
 def test_task_from_dict_no_description():
-    #Arrange
+    # Arrange
     task_dict =  {
         "title": "Make My Bed",
         "is_complete": False
     }
 
-    #Act & Assert
+    # Act & Assert
     with pytest.raises(KeyError, match = 'description'):
         Task.from_dict(task_dict)
 
-@pytest.mark.skip(reason="No way to test this feature yet")
+# @pytest.mark.skip(reason="No way to test this feature yet")
 def test_get_tasks_no_saved_tasks(client):
     # Act
     response = client.get("/tasks")
@@ -105,7 +126,7 @@ def test_get_tasks_no_saved_tasks(client):
     assert response_body == []
 
 
-@pytest.mark.skip(reason="No way to test this feature yet")
+# @pytest.mark.skip(reason="No way to test this feature yet")
 def test_get_tasks_one_saved_tasks(client, one_task):
     # Act
     response = client.get("/tasks")
@@ -124,7 +145,7 @@ def test_get_tasks_one_saved_tasks(client, one_task):
     ]
 
 
-@pytest.mark.skip(reason="No way to test this feature yet")
+# @pytest.mark.skip(reason="No way to test this feature yet")
 def test_get_task(client, one_task):
     # Act
     response = client.get("/tasks/1")
@@ -140,7 +161,7 @@ def test_get_task(client, one_task):
     }
 
 
-@pytest.mark.skip(reason="No way to test this feature yet")
+# @pytest.mark.skip(reason="No way to test this feature yet")
 def test_get_task_not_found(client):
     # Act
     response = client.get("/tasks/1")
@@ -148,14 +169,19 @@ def test_get_task_not_found(client):
 
     # Assert
     assert response.status_code == 404
+    assert response_body == {"message" : "Task (1) is not found."}
 
-    raise Exception("Complete test with assertion about response body")
-    # *****************************************************************
-    # **Complete test with assertion about response body***************
-    # *****************************************************************
 
+def test_get_task_invalid_id(client):
+    # Act
+    response = client.get("/tasks/task")
+    response_body = response.get_json()
 
-@pytest.mark.skip(reason="No way to test this feature yet")
+    # Assert
+    assert response.status_code == 400
+    assert response_body == {"message": "Task (task) is invalid."}
+    
+# @pytest.mark.skip(reason="No way to test this feature yet")
 def test_create_task(client):
     # Act
     response = client.post("/tasks", json={
@@ -181,7 +207,7 @@ def test_create_task(client):
     assert new_task.description == "Test Description"
     assert new_task.completed_at == None
 
-@pytest.mark.skip(reason="No way to test this feature yet")
+# @pytest.mark.skip(reason="No way to test this feature yet")
 def test_update_task(client, one_task):
     # Act
     response = client.put("/tasks/1", json={
@@ -191,6 +217,8 @@ def test_update_task(client, one_task):
 
     # Assert
     assert response.status_code == 204
+    assert response.mimetype == "application/json"
+    assert response.content_length is None
 
     query = db.select(Task).where(Task.id == 1)
     task = db.session.scalar(query)
@@ -200,8 +228,7 @@ def test_update_task(client, one_task):
     assert task.completed_at == None
 
 
-
-@pytest.mark.skip(reason="No way to test this feature yet")
+# @pytest.mark.skip(reason="No way to test this feature yet")
 def test_update_task_not_found(client):
     # Act
     response = client.put("/tasks/1", json={
@@ -212,42 +239,58 @@ def test_update_task_not_found(client):
 
     # Assert
     assert response.status_code == 404
+    assert response_body == {"message" : "Task (1) is not found."}
+    assert db.session.scalar(db.select(Task).where(Task.id == 1)) is None
 
-    raise Exception("Complete test with assertion about response body")
-    # *****************************************************************
-    # **Complete test with assertion about response body***************
-    # *****************************************************************
+def test_update_task_missing_record(client, one_task):
+    # Act
+    response = client.put("/tasks/1", json={
+        "title": "Updated Task Title"
+    })
+    response_body = response.get_json()
 
+    # Assert
+    assert response.status_code == 400
+    assert response_body == {"details": "Invalid data"}
 
-@pytest.mark.skip(reason="No way to test this feature yet")
+def test_update_task_invalid_id(client, one_task):
+    # Act
+    response = client.put("/tasks/task", json={
+        "title": "Updated Task Title",
+        "description": "Updated Test Description",
+    })
+    response_body = response.get_json()
+
+    # Assert
+    assert response.status_code == 400
+    assert response_body == {"message": "Task (task) is invalid."}
+
+# @pytest.mark.skip(reason="No way to test this feature yet")
 def test_delete_task(client, one_task):
     # Act
     response = client.delete("/tasks/1")
 
     # Assert
     assert response.status_code == 204
+    assert response.mimetype == "application/json"
+    assert response.content_length is None
 
     query = db.select(Task).where(Task.id == 1)
     assert db.session.scalar(query) == None
 
-@pytest.mark.skip(reason="No way to test this feature yet")
+# @pytest.mark.skip(reason="No way to test this feature yet")
 def test_delete_task_not_found(client):
     # Act
     response = client.delete("/tasks/1")
     response_body = response.get_json()
 
-    # Assert
+    # Assert 
     assert response.status_code == 404
-
-    raise Exception("Complete test with assertion about response body")
-    # *****************************************************************
-    # **Complete test with assertion about response body***************
-    # *****************************************************************
-
+    assert response_body == {"message" : "Task (1) is not found."}
     assert db.session.scalars(db.select(Task)).all() == []
 
 
-@pytest.mark.skip(reason="No way to test this feature yet")
+# @pytest.mark.skip(reason="No way to test this feature yet")
 def test_create_task_must_contain_title(client):
     # Act
     response = client.post("/tasks", json={
@@ -264,7 +307,7 @@ def test_create_task_must_contain_title(client):
     assert db.session.scalars(db.select(Task)).all() == []
 
 
-@pytest.mark.skip(reason="No way to test this feature yet")
+# @pytest.mark.skip(reason="No way to test this feature yet")
 def test_create_task_must_contain_description(client):
     # Act
     response = client.post("/tasks", json={
@@ -278,4 +321,5 @@ def test_create_task_must_contain_description(client):
     assert response_body == {
         "details": "Invalid data"
     }
-    assert db.session.scalars(db.select(Task)).all() == []
\ No newline at end of file
+    assert db.session.scalars(db.select(Task)).all() == []
+
diff --git a/tests/test_wave_02.py b/tests/test_wave_02.py
index a087e0909..57c02fafa 100644
--- a/tests/test_wave_02.py
+++ b/tests/test_wave_02.py
@@ -1,7 +1,7 @@
 import pytest
 
 
-@pytest.mark.skip(reason="No way to test this feature yet")
+# @pytest.mark.skip(reason="No way to test this feature yet")
 def test_get_tasks_sorted_asc(client, three_tasks):
     # Act
     response = client.get("/tasks?sort=asc")
@@ -29,7 +29,7 @@ def test_get_tasks_sorted_asc(client, three_tasks):
     ]
 
 
-@pytest.mark.skip(reason="No way to test this feature yet")
+# @pytest.mark.skip(reason="No way to test this feature yet")
 def test_get_tasks_sorted_desc(client, three_tasks):
     # Act
     response = client.get("/tasks?sort=desc")
@@ -55,3 +55,40 @@ def test_get_tasks_sorted_desc(client, three_tasks):
             "is_complete": False,
             "title": "Answer forgotten email 📧"},
     ]
+
+# Additional tests
+def test_get_tasks_sort_uppercase_with_white_space(client, three_tasks):
+    # Act
+    response = client.get("/tasks?sort=ASC ")
+    response_body = response.get_json()
+
+    # Assert
+    assert response.status_code == 200
+    assert len(response_body) == 3
+    assert response_body == [
+        {
+            "id": 2,
+            "title": "Answer forgotten email 📧",
+            "description": "",
+            "is_complete": False},
+        {
+            "id": 3,
+            "title": "Pay my outstanding tickets 😭",
+            "description": "",
+            "is_complete": False},
+        {
+            "id": 1,
+            "title": "Water the garden 🌷",
+            "description": "",
+            "is_complete": False}
+    ]
+
+def test_get_tasks_sort_invalid_input(client, three_tasks):
+    # Act
+    response = client.get("/tasks?sort=invalid")
+    response_body = response.get_json()
+
+    # Assert
+    assert response.status_code == 400
+    assert response_body == {"message": "Invalid sort value. Valid options: asc, desc."}
+
diff --git a/tests/test_wave_03.py b/tests/test_wave_03.py
index d7d441695..2abb06355 100644
--- a/tests/test_wave_03.py
+++ b/tests/test_wave_03.py
@@ -4,9 +4,10 @@
 from app.models.task import Task
 from app.db import db
 import pytest
+from datetime import datetime
 
 
-@pytest.mark.skip(reason="No way to test this feature yet")
+# @pytest.mark.skip(reason="No way to test this feature yet")
 def test_mark_complete_on_incomplete_task(client, one_task):
     # Arrange
     """
@@ -34,7 +35,7 @@ def test_mark_complete_on_incomplete_task(client, one_task):
     assert db.session.scalar(query).completed_at
 
 
-@pytest.mark.skip(reason="No way to test this feature yet")
+# @pytest.mark.skip(reason="No way to test this feature yet")
 def test_mark_incomplete_on_complete_task(client, completed_task):
     # Act
     response = client.patch("/tasks/1/mark_incomplete")
@@ -46,7 +47,7 @@ def test_mark_incomplete_on_complete_task(client, completed_task):
     assert db.session.scalar(query).completed_at == None
 
 
-@pytest.mark.skip(reason="No way to test this feature yet")
+# @pytest.mark.skip(reason="No way to test this feature yet")
 def test_mark_complete_on_completed_task(client, completed_task):
     # Arrange
     """
@@ -74,7 +75,7 @@ def test_mark_complete_on_completed_task(client, completed_task):
     query = db.select(Task).where(Task.id == 1)
     assert db.session.scalar(query).completed_at
 
-@pytest.mark.skip(reason="No way to test this feature yet")
+# @pytest.mark.skip(reason="No way to test this feature yet")
 def test_mark_incomplete_on_incomplete_task(client, one_task):
     # Act
     response = client.patch("/tasks/1/mark_incomplete")
@@ -85,8 +86,8 @@ def test_mark_incomplete_on_incomplete_task(client, one_task):
     query = db.select(Task).where(Task.id == 1)
     assert db.session.scalar(query).completed_at == None
 
-
-@pytest.mark.skip(reason="No way to test this feature yet")
+# 
+# @pytest.mark.skip(reason="No way to test this feature yet")
 def test_mark_complete_missing_task(client):
     # Act
     response = client.patch("/tasks/1/mark_complete")
@@ -94,14 +95,11 @@ def test_mark_complete_missing_task(client):
 
     # Assert
     assert response.status_code == 404
-
-    raise Exception("Complete test with assertion about response body")
-    # *****************************************************************
-    # **Complete test with assertion about response body***************
-    # *****************************************************************
+    assert response_body == {"message" : "Task (1) is not found."} 
+    assert db.session.scalar(db.select(Task).where(Task.id == 1)) is None
 
 
-@pytest.mark.skip(reason="No way to test this feature yet")
+# @pytest.mark.skip(reason="No way to test this feature yet")
 def test_mark_incomplete_missing_task(client):
     # Act
     response = client.patch("/tasks/1/mark_incomplete")
@@ -109,8 +107,41 @@ def test_mark_incomplete_missing_task(client):
 
     # Assert
     assert response.status_code == 404
+    assert response_body == {"message" : "Task (1) is not found."}
+    assert db.session.scalar(db.select(Task).where(Task.id == 1)) is None
+
+def test_mark_complete_invalid_id(client):
+    # Act
+    response = client.patch("/tasks/task/mark_complete")
+    response_body = response.get_json()
+
+    # Assert
+    assert response.status_code == 400
+    assert response_body == {"message": "Task (task) is invalid."}
+
+def test_mark_incomplete_invalid_id(client):
+    # Act
+    response = client.patch("/tasks/task/mark_incomplete")
+    response_body = response.get_json()
+
+    # Assert
+    assert response.status_code == 400
+    assert response_body == {"message": "Task (task) is invalid."}
+
+# Additional test
+# @pytest.mark.skip(reason="No way to test this feature yet")
+def test_mark_complete_sets_completed_at_as_datetime(client, one_task):
+    # Arrange
+    with patch("requests.post") as mock_get:
+        mock_get.return_value.status_code = 200
+
+        # Act
+        response = client.patch("/tasks/1/mark_complete")
+
+    # Assert 
+    query = db.select(Task).where(Task.id == 1)
+    task = db.session.scalar(query)
+    assert response.status_code == 204
 
-    raise Exception("Complete test with assertion about response body")
-    # *****************************************************************
-    # **Complete test with assertion about response body***************
-    # *****************************************************************
+    assert task.completed_at
+    assert isinstance(task.completed_at, datetime)
\ No newline at end of file
diff --git a/tests/test_wave_05.py b/tests/test_wave_05.py
index b7cc330ae..bb5d67fda 100644
--- a/tests/test_wave_05.py
+++ b/tests/test_wave_05.py
@@ -1,7 +1,8 @@
 from app.models.goal import Goal
+from app.db import db
 import pytest
 
-@pytest.mark.skip(reason="No way to test this feature yet")
+# @pytest.mark.skip(reason="No way to test this feature yet")
 def test_goal_to_dict():
     #Arrange
     new_goal = Goal(id=1, title="Seize the Day!")
@@ -13,7 +14,7 @@ def test_goal_to_dict():
     assert goal_dict["id"] == 1
     assert goal_dict["title"] == "Seize the Day!"
 
-@pytest.mark.skip(reason="No way to test this feature yet")
+# @pytest.mark.skip(reason="No way to test this feature yet")
 def test_goal_to_dict_no_id():
     #Arrange
     new_goal = Goal(title="Seize the Day!")
@@ -25,7 +26,7 @@ def test_goal_to_dict_no_id():
     assert goal_dict["id"] is None
     assert goal_dict["title"] == "Seize the Day!"
 
-@pytest.mark.skip(reason="No way to test this feature yet")
+# @pytest.mark.skip(reason="No way to test this feature yet")
 def test_goal_to_dict_no_title():
     #Arrange
     new_goal = Goal(id=1)
@@ -39,7 +40,7 @@ def test_goal_to_dict_no_title():
 
 
 
-@pytest.mark.skip(reason="No way to test this feature yet")
+# @pytest.mark.skip(reason="No way to test this feature yet")
 def test_goal_from_dict():
     #Arrange
     goal_dict =  {
@@ -52,7 +53,7 @@ def test_goal_from_dict():
     #Assert
     assert goal_obj.title == "Seize the Day!"
 
-@pytest.mark.skip(reason="No way to test this feature yet")
+# @pytest.mark.skip(reason="No way to test this feature yet")
 def test_goal_from_dict_no_title():
     #Arrange
     goal_dict =  {
@@ -63,7 +64,7 @@ def test_goal_from_dict_no_title():
         Goal.from_dict(goal_dict)
 
 
-@pytest.mark.skip(reason="No way to test this feature yet")
+# @pytest.mark.skip(reason="No way to test this feature yet")
 def test_get_goals_no_saved_goals(client):
     # Act
     response = client.get("/goals")
@@ -74,7 +75,7 @@ def test_get_goals_no_saved_goals(client):
     assert response_body == []
 
 
-@pytest.mark.skip(reason="No way to test this feature yet")
+# @pytest.mark.skip(reason="No way to test this feature yet")
 def test_get_goals_one_saved_goal(client, one_goal):
     # Act
     response = client.get("/goals")
@@ -91,7 +92,7 @@ def test_get_goals_one_saved_goal(client, one_goal):
     ]
 
 
-@pytest.mark.skip(reason="No way to test this feature yet")
+# @pytest.mark.skip(reason="No way to test this feature yet")
 def test_get_goal(client, one_goal):
     # Act
     response = client.get("/goals/1")
@@ -105,22 +106,30 @@ def test_get_goal(client, one_goal):
     }
 
 
-@pytest.mark.skip(reason="test to be completed by student")
+# @pytest.mark.skip(reason="test to be completed by student")
 def test_get_goal_not_found(client):
     pass
     # Act
     response = client.get("/goals/1")
     response_body = response.get_json()
 
-    raise Exception("Complete test")
     # Assert
-    # ---- Complete Test ----
-    # assertion 1 goes here
-    # assertion 2 goes here
-    # ---- Complete Test ----
+    assert response.status_code == 404
+    assert response_body == {"message" : "Goal (1) is not found."}
+
+# @pytest.mark.skip(reason="test to be completed by student")
+def test_get_goal_invalid_id(client):
+    pass
+    # Act
+    response = client.get("/goals/goal")
+    response_body = response.get_json()
+
+    # Assert
+    assert response.status_code == 400
+    assert response_body == {"message" : "Goal (goal) is invalid."}
 
 
-@pytest.mark.skip(reason="No way to test this feature yet")
+# @pytest.mark.skip(reason="No way to test this feature yet")
 def test_create_goal(client):
     # Act
     response = client.post("/goals", json={
@@ -135,41 +144,63 @@ def test_create_goal(client):
         "title": "My New Goal"
     }
 
+    query = db.select(Goal).where(Goal.id == 1)
+    new_goal = db.session.scalar(query)
 
-@pytest.mark.skip(reason="test to be completed by student")
+    assert new_goal
+    assert new_goal.title == "My New Goal" 
+
+# @pytest.mark.skip(reason="test to be completed by student")
 def test_update_goal(client, one_goal):
-    raise Exception("Complete test")
     # Act
-    # ---- Complete Act Here ----
+    response = client.put("/goals/1", json={
+        "title": "Updated title",
+    })
 
     # Assert
-    # ---- Complete Assertions Here ----
-    # assertion 1 goes here
-    # assertion 2 goes here
-    # assertion 3 goes here
-    # ---- Complete Assertions Here ----
+    assert response.status_code == 204
+    assert response.mimetype == "application/json"
+    assert response.content_length is None
+
+    query = db.select(Goal).where(Goal.id == 1)
+    goal = db.session.scalar(query)
 
+    assert goal.title ==  "Updated title"
 
-@pytest.mark.skip(reason="test to be completed by student")
+# @pytest.mark.skip(reason="test to be completed by student")
 def test_update_goal_not_found(client):
-    raise Exception("Complete test")
     # Act
-    # ---- Complete Act Here ----
+    response = client.put("/goals/1", json={
+        "title": "Updated title",
+    })
+    response_body = response.get_json()
 
     # Assert
-    # ---- Complete Assertions Here ----
-    # assertion 1 goes here
-    # assertion 2 goes here
-    # ---- Complete Assertions Here ----
+    assert response.status_code == 404
+    assert response_body == {"message" : "Goal (1) is not found."}
+    assert db.session.scalar(db.select(Goal).where(Goal.id == 1)) is None
 
 
-@pytest.mark.skip(reason="No way to test this feature yet")
+def test_update_goal_invalid_id(client, one_goal):
+    # Act
+    response = client.put("/goals/goal", json={
+        "title": "Updated title",
+    })
+    response_body = response.get_json()
+
+    # Assert
+    assert response.status_code == 400
+    assert response_body == {"message": "Goal (goal) is invalid."}
+
+# @pytest.mark.skip(reason="No way to test this feature yet")
 def test_delete_goal(client, one_goal):
     # Act
     response = client.delete("/goals/1")
 
     # Assert
     assert response.status_code == 204
+    assert response.mimetype == "application/json"
+    assert response.content_length is None
 
     # Check that the goal was deleted
     response = client.get("/goals/1")
@@ -177,28 +208,22 @@ def test_delete_goal(client, one_goal):
 
     response_body = response.get_json()
     assert "message" in response_body
+    assert response_body == {"message" : "Goal (1) is not found."}
+    assert db.session.scalars(db.select(Goal)).all() == []
 
-    raise Exception("Complete test with assertion about response body")
-    # *****************************************************************
-    # **Complete test with assertion about response body***************
-    # *****************************************************************
-
-
-@pytest.mark.skip(reason="test to be completed by student")
+# @pytest.mark.skip(reason="test to be completed by student")
 def test_delete_goal_not_found(client):
-    raise Exception("Complete test")
-
     # Act
-    # ---- Complete Act Here ----
+    response = client.delete("/goals/1")
+    response_body = response.get_json()
 
-    # Assert
-    # ---- Complete Assertions Here ----
-    # assertion 1 goes here
-    # assertion 2 goes here
-    # ---- Complete Assertions Here ----
+    # Assert 
+    assert response.status_code == 404
+    assert response_body == {"message" : "Goal (1) is not found."}
+    assert db.session.scalars(db.select(Goal)).all() == []
 
 
-@pytest.mark.skip(reason="No way to test this feature yet")
+# @pytest.mark.skip(reason="No way to test this feature yet")
 def test_create_goal_missing_title(client):
     # Act
     response = client.post("/goals", json={})
@@ -209,3 +234,4 @@ def test_create_goal_missing_title(client):
     assert response_body == {
         "details": "Invalid data"
     }
+
diff --git a/tests/test_wave_06.py b/tests/test_wave_06.py
index 727fce93a..e741c3b8f 100644
--- a/tests/test_wave_06.py
+++ b/tests/test_wave_06.py
@@ -3,7 +3,7 @@
 import pytest
 
 
-@pytest.mark.skip(reason="No way to test this feature yet")
+# @pytest.mark.skip(reason="No way to test this feature yet")
 def test_post_task_ids_to_goal(client, one_goal, three_tasks):
     # Act
     response = client.post("/goals/1/tasks", json={
@@ -25,7 +25,7 @@ def test_post_task_ids_to_goal(client, one_goal, three_tasks):
     assert len(db.session.scalar(query).tasks) == 3
 
 
-@pytest.mark.skip(reason="No way to test this feature yet")
+# @pytest.mark.skip(reason="No way to test this feature yet")
 def test_post_task_ids_to_goal_overwrites_existing_tasks(client, one_task_belongs_to_one_goal, three_tasks):
     # Act
     response = client.post("/goals/1/tasks", json={
@@ -44,8 +44,7 @@ def test_post_task_ids_to_goal_overwrites_existing_tasks(client, one_task_belong
     query = db.select(Goal).where(Goal.id == 1)
     assert len(db.session.scalar(query).tasks) == 2
 
-
-@pytest.mark.skip(reason="No way to test this feature yet")
+# @pytest.mark.skip(reason="No way to test this feature yet")
 def test_get_tasks_for_specific_goal_no_goal(client):
     # Act
     response = client.get("/goals/1/tasks")
@@ -53,14 +52,10 @@ def test_get_tasks_for_specific_goal_no_goal(client):
 
     # Assert
     assert response.status_code == 404
-
-    raise Exception("Complete test with assertion about response body")
-    # *****************************************************************
-    # **Complete test with assertion about response body***************
-    # *****************************************************************
+    assert response_body == {"message" : "Goal (1) is not found."} 
 
 
-@pytest.mark.skip(reason="No way to test this feature yet")
+# @pytest.mark.skip(reason="No way to test this feature yet")
 def test_get_tasks_for_specific_goal_no_tasks(client, one_goal):
     # Act
     response = client.get("/goals/1/tasks")
@@ -77,7 +72,7 @@ def test_get_tasks_for_specific_goal_no_tasks(client, one_goal):
     }
 
 
-@pytest.mark.skip(reason="No way to test this feature yet")
+# @pytest.mark.skip(reason="No way to test this feature yet")
 def test_get_tasks_for_specific_goal(client, one_task_belongs_to_one_goal):
     # Act
     response = client.get("/goals/1/tasks")
@@ -102,7 +97,7 @@ def test_get_tasks_for_specific_goal(client, one_task_belongs_to_one_goal):
     }
 
 
-@pytest.mark.skip(reason="No way to test this feature yet")
+# @pytest.mark.skip(reason="No way to test this feature yet")
 def test_get_task_includes_goal_id(client, one_task_belongs_to_one_goal):
     response = client.get("/tasks/1")
     response_body = response.get_json()
@@ -116,3 +111,16 @@ def test_get_task_includes_goal_id(client, one_task_belongs_to_one_goal):
         "description": "Notice something new every day",
         "is_complete": False
     }
+
+# Additional test 
+def test_post_task_without_task_ids_key(client, one_goal):
+    # Act
+    response = client.post("/goals/1/tasks", json={
+    })
+    response_body = response.get_json()
+
+    # Assert
+    assert response.status_code == 400
+    assert response_body == {
+        "details": "Invalid data"
+    }
diff --git a/tests/test_wave_07.py b/tests/test_wave_07.py
index 7e7cef55a..a620f2249 100644
--- a/tests/test_wave_07.py
+++ b/tests/test_wave_07.py
@@ -3,8 +3,9 @@
 from app.models.goal import Goal
 from app.models.task import Task
 from app.routes.route_utilities import create_model, validate_model
+from app.db import db
 
-@pytest.mark.skip(reason="No way to test this feature yet")
+# @pytest.mark.skip(reason="No way to test this feature yet")
 def test_route_utilities_validate_model_with_task(client, three_tasks):
     #Act
     task_1 = validate_model(Task, 1)
@@ -24,7 +25,7 @@ def test_route_utilities_validate_model_with_task(client, three_tasks):
     assert task_3.title == "Pay my outstanding tickets 😭"
 
 
-@pytest.mark.skip(reason="No way to test this feature yet")
+# @pytest.mark.skip(reason="No way to test this feature yet")
 def test_route_utilities_validate_model_with_task_invalid_id(client, three_tasks):
     #Act & Assert
     # Calling `validate_model` without being invoked by a route will
@@ -34,26 +35,23 @@ def test_route_utilities_validate_model_with_task_invalid_id(client, three_tasks
     
     # Test that the correct status code and response message are returned
     response = e.value.get_response()
+    response_body = response.get_json()
     assert response.status_code == 400
+    assert response_body == {"message": "Task (One) is invalid."}
 
-    raise Exception("Complete test with an assertion about the response body")
-    # *****************************************************************************
-    # ** Complete test with an assertion about the response body ****************
-    # *****************************************************************************
-
-@pytest.mark.skip(reason="No way to test this feature yet")
+# @pytest.mark.skip(reason="No way to test this feature yet")
 def test_route_utilities_validate_model_with_task_missing_id(client, three_tasks):
     #Act & Assert
     with pytest.raises(HTTPException) as e:
         result_task = validate_model(Task, 4)
     
-    raise Exception("Complete test with assertion status code and response body")
-    # *****************************************************************************
-    # **Complete test with assertion about status code response body***************
-    # *****************************************************************************
+    response = e.value.get_response()
+    response_body = response.get_json()
+    assert response.status_code == 404
+    assert response_body == {"message": "Task (4) is not found."}
 
     
-@pytest.mark.skip(reason="No way to test this feature yet")
+# @pytest.mark.skip(reason="No way to test this feature yet")
 def test_route_utilities_validate_model_with_goal(client, one_goal):
     #Act
     goal_1 = validate_model(Goal, 1)
@@ -62,29 +60,29 @@ def test_route_utilities_validate_model_with_goal(client, one_goal):
     assert goal_1.id == 1
     assert goal_1.title == "Build a habit of going outside daily"
 
-@pytest.mark.skip(reason="No way to test this feature yet")
+# @pytest.mark.skip(reason="No way to test this feature yet")
 def test_route_utilities_validate_model_with_goal_invalid_id(client, one_goal):
     #Act & Assert
     with pytest.raises(HTTPException) as e:
         result_task = validate_model(Goal, "One")
     
-    raise Exception("Complete test with assertion status code and response body")
-    # *****************************************************************************
-    # **Complete test with assertion about status code response body***************
-    # *****************************************************************************
+    response = e.value.get_response()
+    response_body = response.get_json()
+    assert response.status_code == 400
+    assert response_body == {"message": "Goal (One) is invalid."}
 
-@pytest.mark.skip(reason="No way to test this feature yet")
+# @pytest.mark.skip(reason="No way to test this feature yet")
 def test_route_utilities_validate_model_with_goal_missing_id(client, one_goal):
     #Act & Assert
     with pytest.raises(HTTPException) as e:
         result_task = validate_model(Goal, 4)
     
-    raise Exception("Complete test with assertion status code and response body")
-    # *****************************************************************************
-    # **Complete test with assertion about status code response body***************
-    # *****************************************************************************
+    response = e.value.get_response()
+    response_body = response.get_json()
+    assert response.status_code == 404
+    assert response_body == {"message": "Goal (4) is not found."}
 
-@pytest.mark.skip(reason="No way to test this feature yet")
+# @pytest.mark.skip(reason="No way to test this feature yet")
 def test_route_utilities_create_model_with_task(client):
     #Arrange
     request_body = {
@@ -103,7 +101,7 @@ def test_route_utilities_create_model_with_task(client):
     assert response[0]["is_complete"] == False
     assert response[1] == 201
 
-@pytest.mark.skip(reason="No way to test this feature yet")
+# @pytest.mark.skip(reason="No way to test this feature yet")
 def test_route_utilities_create_model_with_task_missing_title(client):
     #Arrange
     request_body = {
@@ -119,8 +117,7 @@ def test_route_utilities_create_model_with_task_missing_title(client):
     assert response.status_code == 400
     assert response.get_json() == {"details": "Invalid data"}
 
-
-@pytest.mark.skip(reason="No way to test this feature yet")
+# @pytest.mark.skip(reason="No way to test this feature yet")
 def test_route_utilities_create_model_with_goal(client):
     #Arrange
     request_body = {
@@ -135,7 +132,7 @@ def test_route_utilities_create_model_with_goal(client):
     assert response[0]["title"] == "Seize the Day!"
     assert response[1] == 201
 
-@pytest.mark.skip(reason="No way to test this feature yet")
+# @pytest.mark.skip(reason="No way to test this feature yet")
 def test_route_utilities_create_model_with_goal_missing_title(client):
     #Arrange
     request_body = {
@@ -145,7 +142,32 @@ def test_route_utilities_create_model_with_goal_missing_title(client):
     with pytest.raises(HTTPException) as e:
         create_model(Goal, request_body)
     
-    raise Exception("Complete test with assertion status code and response body")
-    # *****************************************************************************
-    # **Complete test with assertion about status code response body***************
-    # *****************************************************************************
+    response = e.value.get_response()
+    response_body = response.get_json()
+    assert response.status_code == 400
+    assert response_body == {"details": "Invalid data"}
+
+# Additional test for Task model
+def test_route_utilities_create_model_check_value_of_completed_at(client):
+    #Arrange
+    request_body = {
+        "title": "Go jogging",
+        "description": "Morning exercise",
+    }
+
+    #Act
+    response = create_model(Task, request_body)
+    response_body, status = response
+
+    #Assert
+    query = db.select(Task).where(Task.id == response_body["id"])
+    task = db.session.scalar(query)
+    assert status == 201
+    assert not isinstance(task.completed_at, str)
+    assert task.completed_at is None
+
+
+
+
+
+