diff --git a/database/crud/birthdays.py b/database/crud/birthdays.py
index 054d4c5..df59dfc 100644
--- a/database/crud/birthdays.py
+++ b/database/crud/birthdays.py
@@ -42,4 +42,4 @@ async def get_birthdays_on_day(session: AsyncSession, day: datetime.date) -> lis
     months = extract("month", Birthday.birthday)
 
     statement = select(Birthday).where((days == day.day) & (months == day.month))
-    return list((await session.execute(statement)).scalars())
+    return list((await session.execute(statement)).scalars().all())
diff --git a/tests/test_database/test_crud/test_tasks.py b/tests/test_database/test_crud/test_tasks.py
new file mode 100644
index 0000000..e1e4f97
--- /dev/null
+++ b/tests/test_database/test_crud/test_tasks.py
@@ -0,0 +1,63 @@
+import datetime
+
+import pytest
+from freezegun import freeze_time
+from sqlalchemy import select
+from sqlalchemy.ext.asyncio import AsyncSession
+
+from database.crud import tasks as crud
+from database.enums import TaskType
+from database.models import Task
+
+
+@pytest.fixture
+def task_type() -> TaskType:
+    """Fixture to use the same TaskType in every test"""
+    return TaskType.BIRTHDAYS
+
+
+@pytest.fixture
+async def task(database_session: AsyncSession, task_type: TaskType) -> Task:
+    """Fixture to create a task"""
+    task = Task(task=task_type)
+    database_session.add(task)
+    await database_session.commit()
+    return task
+
+
+async def test_get_task_by_enum_present(database_session: AsyncSession, task: Task, task_type: TaskType):
+    """Test getting a task by its enum type when it exists"""
+    result = await crud.get_task_by_enum(database_session, task_type)
+    assert result is not None
+    assert result == task
+
+
+async def test_get_task_by_enum_not_present(database_session: AsyncSession, task_type: TaskType):
+    """Test getting a task by its enum type when it doesn't exist"""
+    result = await crud.get_task_by_enum(database_session, task_type)
+    assert result is None
+
+
+@freeze_time("2022/07/24")
+async def test_set_execution_time_exists(database_session: AsyncSession, task: Task, task_type: TaskType):
+    """Test setting the execution time of an existing task"""
+    await database_session.refresh(task)
+    assert task.previous_run is None
+
+    await crud.set_last_task_execution_time(database_session, task_type)
+    await database_session.refresh(task)
+    assert task.previous_run == datetime.datetime(year=2022, month=7, day=24)
+
+
+@freeze_time("2022/07/24")
+async def test_set_execution_time_doesnt_exist(database_session: AsyncSession, task_type: TaskType):
+    """Test setting the execution time of a non-existing task"""
+    statement = select(Task).where(Task.task == task_type)
+    results = list((await database_session.execute(statement)).scalars().all())
+    assert len(results) == 0
+
+    await crud.set_last_task_execution_time(database_session, task_type)
+    results = list((await database_session.execute(statement)).scalars().all())
+    assert len(results) == 1
+    task = results[0]
+    assert task.previous_run == datetime.datetime(year=2022, month=7, day=24)