diff --git a/test/Asset/CgiExerciseInterface.php b/test/Asset/CgiExerciseInterface.php
deleted file mode 100644
index 3661d990..00000000
--- a/test/Asset/CgiExerciseInterface.php
+++ /dev/null
@@ -1,10 +0,0 @@
-<?php
-
-namespace PhpSchool\PhpWorkshopTest\Asset;
-
-use PhpSchool\PhpWorkshop\Exercise\CgiExercise;
-use PhpSchool\PhpWorkshop\Exercise\ExerciseInterface;
-
-interface CgiExerciseInterface extends ExerciseInterface, CgiExercise
-{
-}
diff --git a/test/Asset/CliExerciseImpl.php b/test/Asset/CliExerciseImpl.php
index cfab2501..ecb957ec 100644
--- a/test/Asset/CliExerciseImpl.php
+++ b/test/Asset/CliExerciseImpl.php
@@ -12,6 +12,7 @@
 class CliExerciseImpl implements ExerciseInterface, CliExercise
 {
     private string $name;
+    private string $problemFile = 'problem-file.md';
     private SolutionInterface $solution;
     private CliScenario $scenario;
 
@@ -43,7 +44,12 @@ public function getSolution(): SolutionInterface
 
     public function getProblem(): string
     {
-        // TODO: Implement getProblem() method.
+        return $this->problemFile;
+    }
+
+    public function setProblem(string $problemFile): void
+    {
+        $this->problemFile = $problemFile;
     }
 
     public function tearDown(): void
diff --git a/test/Asset/CliExerciseInterface.php b/test/Asset/CliExerciseInterface.php
deleted file mode 100644
index 486477b8..00000000
--- a/test/Asset/CliExerciseInterface.php
+++ /dev/null
@@ -1,10 +0,0 @@
-<?php
-
-namespace PhpSchool\PhpWorkshopTest\Asset;
-
-use PhpSchool\PhpWorkshop\Exercise\CliExercise;
-use PhpSchool\PhpWorkshop\Exercise\ExerciseInterface;
-
-interface CliExerciseInterface extends ExerciseInterface, CliExercise
-{
-}
diff --git a/test/Asset/DatabaseExerciseInterface.php b/test/Asset/DatabaseExerciseInterface.php
deleted file mode 100644
index 4d55b9a5..00000000
--- a/test/Asset/DatabaseExerciseInterface.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-namespace PhpSchool\PhpWorkshopTest\Asset;
-
-use PhpSchool\PhpWorkshop\Exercise\CliExercise;
-use PhpSchool\PhpWorkshop\Exercise\ExerciseInterface;
-use PhpSchool\PhpWorkshop\ExerciseCheck\DatabaseExerciseCheck;
-
-interface DatabaseExerciseInterface extends ExerciseInterface, DatabaseExerciseCheck, CliExercise
-{
-}
diff --git a/test/Command/PrintCommandTest.php b/test/Command/PrintCommandTest.php
index 88be8ed3..292ff920 100644
--- a/test/Command/PrintCommandTest.php
+++ b/test/Command/PrintCommandTest.php
@@ -3,9 +3,8 @@
 namespace PhpSchool\PhpWorkshopTest\Command;
 
 use PhpSchool\PhpWorkshop\Command\PrintCommand;
-use PhpSchool\PhpWorkshop\Exercise\ExerciseType;
 use PhpSchool\PhpWorkshop\UserState\UserState;
-use PhpSchool\PhpWorkshopTest\Asset\CliExerciseInterface;
+use PhpSchool\PhpWorkshopTest\Asset\CliExerciseImpl;
 use PHPUnit\Framework\TestCase;
 use PhpSchool\PhpWorkshop\ExerciseRepository;
 use PhpSchool\PhpWorkshop\MarkdownRenderer;
@@ -18,23 +17,13 @@ public function testExerciseIsPrintedIfAssigned(): void
         $file = tempnam(sys_get_temp_dir(), 'pws');
         file_put_contents($file, '### Exercise 1');
 
-        $exercise = $this->createMock(CliExerciseInterface::class);
-        $exercise
-            ->method('getProblem')
-            ->willReturn($file);
-
-        $exercise
-            ->method('getType')
-            ->willReturn(ExerciseType::CLI());
-
-        $exercise
-            ->method('getName')
-            ->willReturn('some-exercise');
+        $exercise = new CliExerciseImpl();
+        $exercise->setProblem($file);
 
         $repo = new ExerciseRepository([$exercise]);
 
         $state = new UserState();
-        $state->setCurrentExercise('some-exercise');
+        $state->setCurrentExercise('my-exercise');
 
         $output = $this->createMock(OutputInterface::class);
         $renderer = $this->createMock(MarkdownRenderer::class);
diff --git a/test/UserState/LocalJsonSerializerTest.php b/test/UserState/LocalJsonSerializerTest.php
index b7a2743f..e028f88d 100644
--- a/test/UserState/LocalJsonSerializerTest.php
+++ b/test/UserState/LocalJsonSerializerTest.php
@@ -8,7 +8,7 @@
 use PhpSchool\PhpWorkshop\UserState\UserState;
 use PhpSchool\PhpWorkshop\Utils\Path;
 use PhpSchool\PhpWorkshop\Utils\System;
-use PhpSchool\PhpWorkshopTest\Asset\CliExerciseInterface;
+use PhpSchool\PhpWorkshopTest\Asset\CliExerciseImpl;
 use PhpSchool\PhpWorkshopTest\BaseTest;
 use Yoast\PHPUnitPolyfills\Polyfills\AssertionRenames;
 
@@ -16,25 +16,10 @@ class LocalJsonSerializerTest extends BaseTest
 {
     use AssertionRenames;
 
-    /**
-     * @var string
-     */
-    private $tmpDir;
-
-    /**
-     * @var string
-     */
-    private $tmpFile;
-
-    /**
-     * @var string
-     */
-    private $workshopName = 'My Workshop';
-
-    /**
-     * @var ExerciseRepository
-     */
-    private $exerciseRepository;
+    private string $tmpDir;
+    private string $tmpFile;
+    private string $workshopName = 'My Workshop';
+    private ExerciseRepository $exerciseRepository;
 
     public function setUp(): void
     {
@@ -201,12 +186,8 @@ public function deserializerProvider(): array
 
     public function testOldDataWillBeMigratedWhenInCorrectWorkshop(): void
     {
-        $exercise1 = $this->createMock(CliExerciseInterface::class);
-        $exercise2 = $this->createMock(CliExerciseInterface::class);
-        $exercise1->method('getType')->willReturn(ExerciseType::CLI());
-        $exercise2->method('getType')->willReturn(ExerciseType::CLI());
-        $exercise1->method('getName')->willReturn('Exercise 1');
-        $exercise2->method('getName')->willReturn('Exercise 2');
+        $exercise1 = new CliExerciseImpl('Exercise 1');
+        $exercise2 = new CliExerciseImpl('Exercise 2');
 
         $oldData = [
             'current_exercise' => 'Exercise 3',
@@ -246,12 +227,8 @@ public function testOldDataWillBeMigratedWhenInCorrectWorkshop(): void
 
     public function testOldDataWillNotBeMigratedWhenNotInCorrectWorkshop(): void
     {
-        $exercise1 = $this->createMock(CliExerciseInterface::class);
-        $exercise2 = $this->createMock(CliExerciseInterface::class);
-        $exercise1->method('getType')->willReturn(ExerciseType::CLI());
-        $exercise2->method('getType')->willReturn(ExerciseType::CLI());
-        $exercise1->method('getName')->willReturn('Exercise 1');
-        $exercise2->method('getName')->willReturn('Exercise 2');
+        $exercise1 = new CliExerciseImpl('Exercise 1');
+        $exercise2 = new CliExerciseImpl('Exercise 2');
 
         $exercises = [
             $exercise1,
@@ -279,12 +256,8 @@ public function testOldDataWillNotBeMigratedWhenNotInCorrectWorkshop(): void
 
     public function testOldDataWillNotBeMigratedWhenNotInCorrectWorkshopWithOtherWorkshop(): void
     {
-        $exercise1 = $this->createMock(CliExerciseInterface::class);
-        $exercise2 = $this->createMock(CliExerciseInterface::class);
-        $exercise1->method('getType')->willReturn(ExerciseType::CLI());
-        $exercise2->method('getType')->willReturn(ExerciseType::CLI());
-        $exercise1->method('getName')->willReturn('Exercise 1');
-        $exercise2->method('getName')->willReturn('Exercise 2');
+        $exercise1 = new CliExerciseImpl('Exercise 1');
+        $exercise2 = new CliExerciseImpl('Exercise 2');
 
         $oldData = [
             'current_exercise' => 'Exercise 3',