diff --git a/exercises/acronym/AcronymTest.fs b/exercises/acronym/AcronymTest.fs
index 1bb224d12..ef4262729 100644
--- a/exercises/acronym/AcronymTest.fs
+++ b/exercises/acronym/AcronymTest.fs
@@ -6,12 +6,59 @@ open Acronym
 [<Test>]
 let ``Empty string abbreviated to empty string`` () =
     Assert.That(acronym "", Is.EqualTo(""))
-        
-[<TestCase("Portable Network Graphics", ExpectedResult = "PNG", Ignore = "Remove to run test case")>]
-[<TestCase("Ruby on Rails", ExpectedResult = "ROR", Ignore = "Remove to run test case")>]
-[<TestCase("HyperText Markup Language", ExpectedResult = "HTML", Ignore = "Remove to run test case")>]
-[<TestCase("First In, First Out", ExpectedResult = "FIFO", Ignore = "Remove to run test case")>]
-[<TestCase("PHP: Hypertext Preprocessor", ExpectedResult = "PHP", Ignore = "Remove to run test case")>]
-[<TestCase("Complementary metal-oxide semiconductor", ExpectedResult = "CMOS", Ignore = "Remove to run test case")>]
-let ``Phrase abbreviated to acronym`` (phrase: string) =
-    acronym phrase
\ No newline at end of file
+
+[<Test>]
+[<Ignore("Remove to run test")>]
+let ``Basic`` () =
+    let phrase = "Portable Network Graphics"
+    let expected = "PNG"
+    let actual = acronym phrase
+    Assert.That(expected, Is.EqualTo(actual))
+
+[<Test>]
+[<Ignore("Remove to run test")>]
+let ``Lowercase words`` () =
+    let phrase = "Ruby on Rails"
+    let expected = "ROR"
+    let actual = acronym phrase
+    Assert.That(expected, Is.EqualTo(actual))
+
+[<Test>]
+[<Ignore("Remove to run test")>]
+let ``Camel case`` () =
+    let phrase = "HyperText Markup Language"
+    let expected = "HTML"
+    let actual = acronym phrase
+    Assert.That(expected, Is.EqualTo(actual))
+
+[<Test>]
+[<Ignore("Remove to run test")>]
+let ``Punctuation`` () =
+    let phrase = "First In, First Out"
+    let expected = "FIFO"
+    let actual = acronym phrase
+    Assert.That(expected, Is.EqualTo(actual))
+
+[<Test>]
+[<Ignore("Remove to run test")>]
+let ``All-Caps words`` () =
+    let phrase = "PHP: Hypertext Preprocessor"
+    let expected = "PHP"
+    let actual = acronym phrase
+    Assert.That(expected, Is.EqualTo(actual))
+
+[<Test>]
+[<Ignore("Remove to run test")>]
+let ``Non-acronym all-caps word`` () =
+    let phrase = "GNU Image Manipulation Program"
+    let expected = "GIMP"
+    let actual = acronym phrase
+    Assert.That(expected, Is.EqualTo(actual))
+
+[<Test>]
+[<Ignore("Remove to run test")>]
+let ``Hyphenated`` () =
+    let phrase = "Complementary metal-oxide semiconductor"
+    let expected = "CMOS"
+    let actual = acronym phrase
+    Assert.That(expected, Is.EqualTo(actual))
\ No newline at end of file