     // Tests for Blockstring support
     //
 
-    func testBlockStringIndentationAndBlankLine() throws {
+    func testBlockStringIndentAndBlankLine() throws {
         let rawString = "\n\n\n    TopLevel {\n        indented\n        alsoIndented\n    }\n\n\n\t\t\n"
         let cleanedString = blockStringValue(rawValue: rawString)
         
         XCTAssertEqual(cleanedString, "TopLevel {\n    indented\n    alsoIndented\n}")
     }
     
-    func testBlockStringDoubleIndentationAndBlankLine() throws {
+    func testBlockStringDoubleIndentAndBlankLine() throws {
         let rawString = "\n\n\n    TopLevel {\n        indented: {\n            foo: String\n        }\n        alsoIndented\n    }\n\n\n\t\t\n"
         let cleanedString = blockStringValue(rawValue: rawString)
         
         XCTAssertEqual(cleanedString, "TopLevel {\n    indented: {\n        foo: String\n    }\n    alsoIndented\n}")
     }
 
-    func testBlockStringIndentationAndBlankLineFirstLineNotIndentedWeird() throws {
+    func testBlockStringIndentAndBlankLineFirstLineNotIndent() throws {
         let rawString = "\n\n\nTopLevel {\n        indented\n        alsoIndented\n}\n\n\n\t\t\n"
         let cleanedString = blockStringValue(rawValue: rawString)
         
         XCTAssertEqual(cleanedString, "TopLevel {\n        indented\n        alsoIndented\n}")
     }
 
-    func testBlockStringIndentationMultilineAndBlankLineFirstLineNotIndentedWeird() throws {
+    func testBlockStringIndentBlankLineFirstLineNotIndentWeird() throws {
         let rawString = """
             
             

        XCTAssertEqual(token, expected, "\nexpected: \n \(dump(expected))\n\ngot: \n\(dump(token))\n")
    }

    func testMultiLineStringsUnescapedReturns() throws {
        let token = try lexOne(#"""
                """
                 Multi-line string

        XCTAssertEqual(cleanedString, "TopLevel {\n    indented\n    alsoIndented\n}")
    }

    func testBlockStringIndentMultilineWithSingleSpaceIndent() throws {
        let rawString = " Multi-line string\n With Inner \"foo\" \n should be Valid "
        let cleanedString = blockStringValue(rawValue: rawString)
        
        XCTAssertEqual(cleanedString, " Multi-line string\nWith Inner \"foo\" \nshould be Valid ")
    }
    
    func testBlockStringIndentMultilineWithSingleSpaceIndentExtraLines() throws {
        let rawString = "\n Multi-line string\n With Inner \"foo\" \n should be Valid \n"
        let cleanedString = blockStringValue(rawValue: rawString)
        
